Let 'configure' use the system expat on Leopard. Hooray!

diff --git a/configure b/configure
index 57dc97129d11bfdea0e2683b5ce05c33791c980e..47f68c4ce7c83a9ed7615b2451d4d85fb8ee113c 100755 (executable)
--- a/configure
+++ b/configure
@@ -2,7 +2,7 @@
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for GPSBabel 1.3.5.
 #
-# Report bugs to <BUG-REPORT-ADDRESS>. 
+# Report bugs to <BUG-REPORT-ADDRESS>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -4310,7 +4310,9 @@ if test "${with_expathdr+set}" = set; then
 else
 
        case "$target" in
-       *-*-darwin*)
+       *-*-darwin6*|*-*-darwin7|*-*-darwin8)
+               # Restrict test to OS/X 10.4 and earlier.  Leopard (10.5)
+               # provides expat and in a sensible location.
                if test -f /sw/include/expat.h ; then
                        xpathdr=/sw/include/
                fi
@@ -4342,7 +4344,9 @@ if test "${with_libexpat+set}" = set; then
 else
 
        case "$target" in
-       *-*-darwin*)
+       *-*-darwin6*|*-*-darwin7|*-*-darwin8)
+               # Restrict test to OS/X 10.4 and earlier.  Leopard (10.5)
+               # provides expat and in a sensible location.
                if test -f /sw/lib/libexpat.a ; then
                        # libexpat installed via fink
                        EXPAT_LIB=/sw/lib/libexpat.a

diff --git a/configure.in b/configure.in
index c96079570535dbf34ea107db4c5d4032ad304dd7..e175a711b821e5eaaf7f6ec76eda8ec9c80db0e7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -195,7 +195,9 @@ AC_ARG_WITH(expathdr,
   [  --with-expathdr[=DIR]   Use this to specify the location of expat.h],
   [ xpathdr="$withval" ], [
        case "$target" in
-       *-*-darwin*)
+       *-*-darwin6*|*-*-darwin7|*-*-darwin8)
+               # Restrict test to OS/X 10.4 and earlier.  Leopard (10.5) 
+               # provides expat and in a sensible location.
                if test -f /sw/include/expat.h ; then
                        xpathdr=/sw/include/
                fi
@@ -221,7 +223,9 @@ AC_ARG_WITH(libexpat,
     EXPAT_LIB="-L$withval -lexpat"
   ], [
        case "$target" in
-       *-*-darwin*)
+       *-*-darwin6*|*-*-darwin7|*-*-darwin8)
+               # Restrict test to OS/X 10.4 and earlier.  Leopard (10.5) 
+               # provides expat and in a sensible location.
                if test -f /sw/lib/libexpat.a ; then
                        # libexpat installed via fink
                        EXPAT_LIB=/sw/lib/libexpat.a